-
Notifications
You must be signed in to change notification settings - Fork 245
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore(release): 1.80.0 #4041
Merged
Merged
chore(release): 1.80.0 #4041
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…=9.1.3 in /gh-pages (#4019) Updates the requirements on [mkdocs-material](https://github.com/squidfunk/mkdocs-material) to permit the latest version. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/squidfunk/mkdocs-material/releases">mkdocs-material's releases</a>.</em></p> <blockquote> <h2>mkdocs-material-9.1.3</h2> <ul> <li>Added Kurdish (Soranî) translations</li> <li>Updated Norwegian (Bokmål), Portuguese and Romanian translations</li> <li>Improved compatibility with <code>mkdocs-jupyter</code> plugin</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5198">#5198</a>: Built-in search plugin not filtering <code>script</code> and <code>style</code> tags</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5176">#5176</a>: Back-to-top + instant loading not working (9.1.1 regression)</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG">mkdocs-material's changelog</a>.</em></p> <blockquote> <p>mkdocs-material-9.1.3 (2023-03-14)</p> <ul> <li>Added Kurdish (Soranî) translations</li> <li>Updated Norwegian (Bokmål), Portuguese and Romanian translations</li> <li>Improved compatibility with mkdocs-jupyter plugin</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5198">#5198</a>: Built-in search plugin not filtering script and style tags</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5176">#5176</a>: Back-to-top + instant loading not working (9.1.1 regression)</li> </ul> <p>mkdocs-material-9.1.2+insiders-4.32.3 (2023-03-09)</p> <ul> <li>Fixed Docker image release workflow (9.1.0 regression)</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5159">#5159</a>: Missing underline for abbreviations (9.1.0 regression)</li> </ul> <p>mkdocs-material-9.1.2 (2023-03-09)</p> <ul> <li>Updated Icelandic, Korean and Swedish translations</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5168">#5168</a>: Mermaid text boxes overflow (9.0.13 regression)</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5155">#5155</a>: table of contents not highlighting percent-encoded URLs</li> </ul> <p>mkdocs-material-9.1.1 (2023-03-05)</p> <ul> <li>Updated Czech and Thai translations</li> <li>Improved instant loading (scroll restoration, slow connections)</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5023">#5023</a>: Instant loading not allowing to go back to initial page</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/3797">#3797</a>: Instant loading does not work with section anchors in Safari</li> </ul> <p>mkdocs-material-9.1.0+insiders-4.32.2 (2023-03-02)</p> <ul> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5127">#5127</a>: Privacy plugin not handling large number of occurrences</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5126">#5126</a>: Privacy plugin breaks when replacing specific emojis</li> </ul> <p>mkdocs-material-9.1.0 (2023-03-02)</p> <ul> <li>Docker image now available for amd64, arm64 and arm/v7</li> <li>Updated Chinese (Taiwanese) translations</li> <li>Generalized tag identifier implementation</li> <li>Fixed flickering of header shadow on load</li> <li>Fixed occasional flickering of announcement bar</li> </ul> <p>mkdocs-material-9.0.15 (2023-02-26)</p> <ul> <li>Updated Chinese (Traditional) translations</li> <li>Updated Hebrew translations</li> </ul> <p>mkdocs-material-9.0.14+insiders-4.32.1 (2023-02-23)</p> <ul> <li>Fixed code block spans interfering with copying</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5077">#5077</a>: Privacy plugin breaks image alt text encoding</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5079">#5079</a>: Privacy plugin removing rel=me on external links</li> </ul> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/d7348cc2170a6020e985ce60c8650ae146d1533d"><code>d7348cc</code></a> Prepare 9.1.3 release</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/9752ad26309309e94c2e87bf6593b9e5f81e8df6"><code>9752ad2</code></a> Fixed back-to-top button when using instant loading</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/a7c1d0647026cc6fa0d45478d190f1e5418c6619"><code>a7c1d06</code></a> Added Norwegian (Bokmål) translations</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/9cbdb79a532f351df77a4224b8a0f251f6bb4c8a"><code>9cbdb79</code></a> Added Romanian translations</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/c54660a0b1ad338260e4f410b8ca135bc915845d"><code>c54660a</code></a> Merge branch 'master' of github.com:squidfunk/mkdocs-material</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/645de23a19a150b00f44bceb5cf027c26ebfaf79"><code>645de23</code></a> Updated dependencies</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/85eaceba041c7f9134bbbc4bdd747f285f1a7c85"><code>85eaceb</code></a> Updated Portuguese translations</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/b5925cf891d78410a87684b4d473d01221fbf93e"><code>b5925cf</code></a> Documentation</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/2c7b0a3fc1b665f0f2771b99ecc02d61e0df8ec3"><code>2c7b0a3</code></a> Fixed search plugin not removing subsequent script and style tags</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/9f29913497846b375c452758f724fa6c3cfadc97"><code>9f29913</code></a> restore missing override file: iconsearch_index.json</li> <li>Additional commits viewable in <a href="https://github.com/squidfunk/mkdocs-material/compare/9.1.2...9.1.3">compare view</a></li> </ul> </details> <br /> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
…ges/@jsii/python-runtime (#4020) Updates the requirements on [wheel](https://github.com/pypa/wheel) to permit the latest version. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/pypa/wheel/blob/main/docs/news.rst">wheel's changelog</a>.</em></p> <blockquote> <h1>Release Notes</h1> <p><strong>0.40.0 (2023-03-14)</strong></p> <ul> <li>Added a <code>wheel tags</code> command to modify tags on an existing wheel (PR by Henry Schreiner)</li> <li>Updated vendored <code>packaging</code> to 23.0</li> <li><code>wheel unpack</code> now preserves the executable attribute of extracted files</li> <li>Fixed spaces in platform names not being converted to underscores (PR by David Tucker)</li> <li>Fixed <code>RECORD</code> files in generated wheels missing the regular file attribute</li> <li>Fixed <code>DeprecationWarning</code> about the use of the deprecated <code>pkg_resources</code> API (PR by Thomas Grainger)</li> <li>Wheel now uses flit-core as a build backend (PR by Henry Schreiner)</li> </ul> <p><strong>0.38.4 (2022-11-09)</strong></p> <ul> <li>Fixed <code>PKG-INFO</code> conversion in <code>bdist_wheel</code> mangling UTF-8 header values in <code>METADATA</code> (PR by Anderson Bravalheri)</li> </ul> <p><strong>0.38.3 (2022-11-08)</strong></p> <ul> <li>Fixed install failure when used with <code>--no-binary</code>, reported on Ubuntu 20.04, by removing <code>setup_requires</code> from <code>setup.cfg</code></li> </ul> <p><strong>0.38.2 (2022-11-05)</strong></p> <ul> <li>Fixed regression introduced in v0.38.1 which broke parsing of wheel file names with multiple platform tags</li> </ul> <p><strong>0.38.1 (2022-11-04)</strong></p> <ul> <li>Removed install dependency on setuptools</li> <li>The future-proof fix in 0.36.0 for converting PyPy's SOABI into a abi tag was faulty. Fixed so that future changes in the SOABI will not change the tag.</li> </ul> <p><strong>0.38.0 (2022-10-21)</strong></p> <ul> <li>Dropped support for Python < 3.7</li> <li>Updated vendored <code>packaging</code> to 21.3</li> <li>Replaced all uses of <code>distutils</code> with <code>setuptools</code></li> <li>The handling of <code>license_files</code> (including glob patterns and default values) is now delegated to <code>setuptools>=57.0.0</code> (<a href="https://redirect.github.com/pypa/wheel/issues/466">#466</a>). The package dependencies were updated to reflect this change.</li> <li>Fixed potential DoS attack via the <code>WHEEL_INFO_RE</code> regular expression</li> <li>Fixed <code>ValueError: ZIP does not support timestamps before 1980</code> when using <code>SOURCE_DATE_EPOCH=0</code> or when on-disk timestamps are earlier than 1980-01-01. Such timestamps are now changed to the minimum value before packaging.</li> </ul> <p><strong>0.37.1 (2021-12-22)</strong></p> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/pypa/wheel/commit/461f7a3a2d4824009ca4855b3300d61e6d405dc4"><code>461f7a3</code></a> Updated version number in <code>__init__.py</code></li> <li><a href="https://github.com/pypa/wheel/commit/e3344b498e69a0228ed1a915233ecc36203ce7e8"><code>e3344b4</code></a> Removed unnecessary rule exemption</li> <li><a href="https://github.com/pypa/wheel/commit/6aaf9c347e3e0893c89bd75aef5905f136a37de2"><code>6aaf9c3</code></a> Created a new release</li> <li><a href="https://github.com/pypa/wheel/commit/566644ac843e1b6ad4089e50ce0c64bf2f4e2417"><code>566644a</code></a> Folded a long line to stay within 88 chars</li> <li><a href="https://github.com/pypa/wheel/commit/e3f9b2b35659599c82e362d8c11f480ff6abb88a"><code>e3f9b2b</code></a> Added missing PR attributions</li> <li><a href="https://github.com/pypa/wheel/commit/9e280dbaab9858a753d9e00e87830d607ecfdb43"><code>9e280db</code></a> Report stderr contents if <code>flit build</code> fails</li> <li><a href="https://github.com/pypa/wheel/commit/4c68d19b5243f0eafa51243bb765ca7f21115fcf"><code>4c68d19</code></a> Added venv* to .gitignore</li> <li><a href="https://github.com/pypa/wheel/commit/a18a70781cc83911c46941d5be0702f4f98eea7c"><code>a18a707</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://redirect.github.com/pypa/wheel/issues/517">#517</a>)</li> <li><a href="https://github.com/pypa/wheel/commit/ba4b195a0ea86bdbe7bccab2dffef987d9d45510"><code>ba4b195</code></a> Added a couple of missing changelog entries (<a href="https://redirect.github.com/pypa/wheel/issues/516">#516</a>)</li> <li><a href="https://github.com/pypa/wheel/commit/934fe177ff912c8e03d5ae951d3805e1fd90ba5e"><code>934fe17</code></a> Changed <code>wheel unpack</code> to honor the original permissions of files (<a href="https://redirect.github.com/pypa/wheel/issues/514">#514</a>)</li> <li>Additional commits viewable in <a href="https://github.com/pypa/wheel/compare/0.38.0...0.40.0">compare view</a></li> </ul> </details> <br /> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
--- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
Tablet files can grow pretty large, and cache files even larger. In order to avoir running into the maximum string length node supports when encoding or decoding those, use a streaming JSON encoder / decoder. Backports aws/jsii-rosetta#43 --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0
When using types sourced from redirected declarations files (using `typesVersions`), the `symbolId` generated for type lookups incorrectly refers to the redirected path instead of the canonical one. This adds code to reverse the `typesVersions` mapping to get back to the original and canonical path. --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0
…=9.1.5 in /gh-pages (#4039) Updates the requirements on [mkdocs-material](https://github.com/squidfunk/mkdocs-material) to permit the latest version. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/squidfunk/mkdocs-material/releases">mkdocs-material's releases</a>.</em></p> <blockquote> <h2>mkdocs-material-9.1.5</h2> <ul> <li>Updated Lithuanian and Japanese translations</li> <li>Updated Mermaid.js to version 9.4.3</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5290">#5290</a>: Footer previous/next labels cut-off for short page titles</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG">mkdocs-material's changelog</a>.</em></p> <blockquote> <p>mkdocs-material-9.1.5 (2023-03-31)</p> <ul> <li>Updated Lithuanian and Japanese translations</li> <li>Updated Mermaid.js to version 9.4.3</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5290">#5290</a>: Footer previous/next labels cut-off for short page titles</li> </ul> <p>mkdocs-material-9.1.4+insiders-4.32.4 (2023-03-24)</p> <ul> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5241">#5241</a>: Built-in typeset plugin jams navigation for anchors in headings</li> </ul> <p>mkdocs-material-9.1.4 (2023-03-24)</p> <ul> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5239">#5239</a>: Instant loading breaks anchors in details (9.1.1 regression)</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5211">#5211</a>: Anchor following not working for Chinese (9.1.2 regression)</li> </ul> <p>mkdocs-material-9.1.3 (2023-03-14)</p> <ul> <li>Added Kurdish (Soranî) translations</li> <li>Updated Norwegian (Bokmål), Portuguese and Romanian translations</li> <li>Improved compatibility with mkdocs-jupyter plugin</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5198">#5198</a>: Built-in search plugin not filtering script and style tags</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5176">#5176</a>: Back-to-top + instant loading not working (9.1.1 regression)</li> </ul> <p>mkdocs-material-9.1.2+insiders-4.32.3 (2023-03-09)</p> <ul> <li>Fixed Docker image release workflow (9.1.0 regression)</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5159">#5159</a>: Missing underline for abbreviations (9.1.0 regression)</li> </ul> <p>mkdocs-material-9.1.2 (2023-03-09)</p> <ul> <li>Updated Icelandic, Korean and Swedish translations</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5168">#5168</a>: Mermaid text boxes overflow (9.0.13 regression)</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5155">#5155</a>: Table of contents not highlighting percent-encoded URLs</li> </ul> <p>mkdocs-material-9.1.1 (2023-03-05)</p> <ul> <li>Updated Czech and Thai translations</li> <li>Improved instant loading (scroll restoration, slow connections)</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5023">#5023</a>: Instant loading not allowing to go back to initial page</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/3797">#3797</a>: Instant loading does not work with section anchors in Safari</li> </ul> <p>mkdocs-material-9.1.0+insiders-4.32.2 (2023-03-02)</p> <ul> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5127">#5127</a>: Privacy plugin not handling large number of occurrences</li> <li>Fixed <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5126">#5126</a>: Privacy plugin breaks when replacing specific emojis</li> </ul> <p>mkdocs-material-9.1.0 (2023-03-02)</p> <ul> <li>Docker image now available for amd64, arm64 and arm/v7</li> <li>Updated Chinese (Taiwanese) translations</li> </ul> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/5f431ec92144be317c5d7ddfe7c386717f7a1395"><code>5f431ec</code></a> Prepare 9.1.5 release</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/d8b066565a833498f73430f8a4151a2410b5d892"><code>d8b0665</code></a> Merge pull request <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5295">#5295</a> from AnaisUrlichs/master</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/062ee027cd2427568b2b3dcedd3321d85592d615"><code>062ee02</code></a> Merge pull request <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/1">#1</a> from AnaisUrlichs/adding-trivy</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/338ff8c4a72210ffe178b8905a0ff192ee1a7d4b"><code>338ff8c</code></a> adding Trivy to open source user list</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/355761d93c270e1e7e82e9c6d7efc2297a854b3f"><code>355761d</code></a> Merge pull request <a href="https://redirect.github.com/squidfunk/mkdocs-material/issues/5293">#5293</a> from tealgreen0503/hotfix/ja-translation</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/1c793ebaff0ef694e7231e69a40426bc047807da"><code>1c793eb</code></a> fix Japanese translation</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/cd18cb5dcb8faa4ac4f4839ca05126c0cad36d0d"><code>cd18cb5</code></a> fix Japanese translation</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/f4d894d53bc19200a1712c93c97f6d6debe40665"><code>f4d894d</code></a> Fixed footer direction label being cut off</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/7c473e148b61830a4befa3848b0c87eb84fd6e4a"><code>7c473e1</code></a> Added FastAPI as a silver sponsor 🎉</li> <li><a href="https://github.com/squidfunk/mkdocs-material/commit/0184b9701b89a05c5dc4664df974c7f0593fef8a"><code>0184b97</code></a> Updated README</li> <li>Additional commits viewable in <a href="https://github.com/squidfunk/mkdocs-material/compare/9.1.3...9.1.5">compare view</a></li> </ul> </details> <br /> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) Dependabot will merge this PR once CI passes on it, as requested by @RomainMuller. [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
When executing the copy command, for symlinked node_modules like in the case of pnpm, the copy will treat nested folders as files which breaks the pack command. De-referencing will make sure any symlinked folders are actually dereferenced. --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0
… /packages/@jsii/go-runtime/jsii-runtime-go (#4028) Bumps [github.com/mattn/go-isatty](https://github.com/mattn/go-isatty) from 0.0.17 to 0.0.18. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/mattn/go-isatty/commit/72a590e157f100a8191f6a086e84d5f6f73da9d6"><code>72a590e</code></a> Merge pull request <a href="https://redirect.github.com/mattn/go-isatty/issues/82">#82</a> from dolmen-go/upgrade-x-sys-tagged</li> <li><a href="https://github.com/mattn/go-isatty/commit/c84e2ccda8216de6795bcf44ecde47a7372d9681"><code>c84e2cc</code></a> Merge pull request <a href="https://redirect.github.com/mattn/go-isatty/issues/83">#83</a> from dolmen-go/ci-add-go1.20</li> <li><a href="https://github.com/mattn/go-isatty/commit/77d7704101a912de6bfa98e295d2a865a91bb781"><code>77d7704</code></a> CI: add Go 1.20</li> <li><a href="https://github.com/mattn/go-isatty/commit/1f921902b3bfe527d60684acced8c1ae88e4e581"><code>1f92190</code></a> CI: drop Go 1.15, 1.16</li> <li><a href="https://github.com/mattn/go-isatty/commit/ddec212a9a29fdabde3d2237352d9f8dc1a2c2a1"><code>ddec212</code></a> deps: use a tagged version of golang.org/x/sys</li> <li>See full diff in <a href="https://github.com/mattn/go-isatty/compare/v0.0.17...v0.0.18">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/mattn/go-isatty&package-manager=go_modules&previous-version=0.0.17&new-version=0.0.18)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) Dependabot will merge this PR once CI passes on it, as requested by @RomainMuller. [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
…ges/@jsii/python-runtime (#4038) Updates the requirements on [black](https://github.com/psf/black) to permit the latest version. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/psf/black/releases">black's releases</a>.</em></p> <blockquote> <h2>23.3.0</h2> <h3>Highlights</h3> <p>This release fixes a longstanding confusing behavior in Black's GitHub action, where the version of the action did not determine the version of Black being run (issue <a href="https://redirect.github.com/psf/black/issues/3382">#3382</a>). In addition, there is a small bug fix around imports and a number of improvements to the preview style.</p> <p>Please try out the <a href="https://black.readthedocs.io/en/stable/the_black_code_style/future_style.html#preview-style">preview style</a> with <code>black --preview</code> and tell us your feedback. All changes in the preview style are expected to become part of Black's stable style in January 2024.</p> <h3>Stable style</h3> <ul> <li>Import lines with <code># fmt: skip</code> and <code># fmt: off</code> no longer have an extra blank line added when they are right after another import line (<a href="https://redirect.github.com/psf/black/issues/3610">#3610</a>)</li> </ul> <h3>Preview style</h3> <ul> <li>Add trailing commas to collection literals even if there's a comment after the last entry (<a href="https://redirect.github.com/psf/black/issues/3393">#3393</a>)</li> <li><code>async def</code>, <code>async for</code>, and <code>async with</code> statements are now formatted consistently compared to their non-async version. (<a href="https://redirect.github.com/psf/black/issues/3609">#3609</a>)</li> <li><code>with</code> statements that contain two context managers will be consistently wrapped in parentheses (<a href="https://redirect.github.com/psf/black/issues/3589">#3589</a>)</li> <li>Let string splitters respect <a href="https://www.unicode.org/reports/tr11/">East Asian Width</a> (<a href="https://redirect.github.com/psf/black/issues/3445">#3445</a>)</li> <li>Now long string literals can be split after East Asian commas and periods (<code>、</code> U+3001 IDEOGRAPHIC COMMA, <code>。</code> U+3002 IDEOGRAPHIC FULL STOP, & <code>,</code> U+FF0C FULLWIDTH COMMA) besides before spaces (<a href="https://redirect.github.com/psf/black/issues/3445">#3445</a>)</li> <li>For stubs, enforce one blank line after a nested class with a body other than just <code>...</code> (<a href="https://redirect.github.com/psf/black/issues/3564">#3564</a>)</li> <li>Improve handling of multiline strings by changing line split behavior (<a href="https://redirect.github.com/psf/black/issues/1879">#1879</a>)</li> </ul> <h3>Parser</h3> <ul> <li>Added support for formatting files with invalid type comments (<a href="https://redirect.github.com/psf/black/issues/3594">#3594</a>)</li> </ul> <h3>Integrations</h3> <ul> <li>Update GitHub Action to use the version of Black equivalent to action's version if version input is not specified (<a href="https://redirect.github.com/psf/black/issues/3543">#3543</a>)</li> <li>Fix missing Python binary path in autoload script for vim (<a href="https://redirect.github.com/psf/black/issues/3508">#3508</a>)</li> </ul> <h3>Documentation</h3> <ul> <li>Document that only the most recent release is supported for security issues; vulnerabilities should be reported through Tidelift (<a href="https://redirect.github.com/psf/black/issues/3612">#3612</a>)</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/psf/black/blob/main/CHANGES.md">black's changelog</a>.</em></p> <blockquote> <h2>23.3.0</h2> <h3>Highlights</h3> <p>This release fixes a longstanding confusing behavior in Black's GitHub action, where the version of the action did not determine the version of Black being run (issue <a href="https://redirect.github.com/psf/black/issues/3382">#3382</a>). In addition, there is a small bug fix around imports and a number of improvements to the preview style.</p> <p>Please try out the <a href="https://black.readthedocs.io/en/stable/the_black_code_style/future_style.html#preview-style">preview style</a> with <code>black --preview</code> and tell us your feedback. All changes in the preview style are expected to become part of Black's stable style in January 2024.</p> <h3>Stable style</h3> <ul> <li>Import lines with <code># fmt: skip</code> and <code># fmt: off</code> no longer have an extra blank line added when they are right after another import line (<a href="https://redirect.github.com/psf/black/issues/3610">#3610</a>)</li> </ul> <h3>Preview style</h3> <ul> <li>Add trailing commas to collection literals even if there's a comment after the last entry (<a href="https://redirect.github.com/psf/black/issues/3393">#3393</a>)</li> <li><code>async def</code>, <code>async for</code>, and <code>async with</code> statements are now formatted consistently compared to their non-async version. (<a href="https://redirect.github.com/psf/black/issues/3609">#3609</a>)</li> <li><code>with</code> statements that contain two context managers will be consistently wrapped in parentheses (<a href="https://redirect.github.com/psf/black/issues/3589">#3589</a>)</li> <li>Let string splitters respect <a href="https://www.unicode.org/reports/tr11/">East Asian Width</a> (<a href="https://redirect.github.com/psf/black/issues/3445">#3445</a>)</li> <li>Now long string literals can be split after East Asian commas and periods (<code>、</code> U+3001 IDEOGRAPHIC COMMA, <code>。</code> U+3002 IDEOGRAPHIC FULL STOP, & <code>,</code> U+FF0C FULLWIDTH COMMA) besides before spaces (<a href="https://redirect.github.com/psf/black/issues/3445">#3445</a>)</li> <li>For stubs, enforce one blank line after a nested class with a body other than just <code>...</code> (<a href="https://redirect.github.com/psf/black/issues/3564">#3564</a>)</li> <li>Improve handling of multiline strings by changing line split behavior (<a href="https://redirect.github.com/psf/black/issues/1879">#1879</a>)</li> </ul> <h3>Parser</h3> <ul> <li>Added support for formatting files with invalid type comments (<a href="https://redirect.github.com/psf/black/issues/3594">#3594</a>)</li> </ul> <h3>Integrations</h3> <ul> <li>Update GitHub Action to use the version of Black equivalent to action's version if version input is not specified (<a href="https://redirect.github.com/psf/black/issues/3543">#3543</a>)</li> <li>Fix missing Python binary path in autoload script for vim (<a href="https://redirect.github.com/psf/black/issues/3508">#3508</a>)</li> </ul> <h3>Documentation</h3> <ul> <li>Document that only the most recent release is supported for security issues; vulnerabilities should be reported through Tidelift (<a href="https://redirect.github.com/psf/black/issues/3612">#3612</a>)</li> </ul> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/psf/black/commit/bf7a16254ec96b084a6caf3d435ec18f0f245cc7"><code>bf7a162</code></a> Fixup the changelog (<a href="https://redirect.github.com/psf/black/issues/3628">#3628</a>)</li> <li><a href="https://github.com/psf/black/commit/9b2b048692f0bd642f38230b4e61c778a4653f91"><code>9b2b048</code></a> Prepare release 23.3.0 (<a href="https://redirect.github.com/psf/black/issues/3625">#3625</a>)</li> <li><a href="https://github.com/psf/black/commit/bf5abdb0b6cf6644628977230736a0a6478c1bff"><code>bf5abdb</code></a> Specify Python exec path with minor version if available (<a href="https://redirect.github.com/psf/black/issues/3508">#3508</a>)</li> <li><a href="https://github.com/psf/black/commit/b542f589a5c4041f54847591104cd51684849f2e"><code>b542f58</code></a> Use GH action version when version argument not specified (<a href="https://redirect.github.com/psf/black/issues/3543">#3543</a>)</li> <li><a href="https://github.com/psf/black/commit/f3b1a3b9d2fc6de8f0845399cb80d8bdfd6400fd"><code>f3b1a3b</code></a> Bump furo from 2022.12.7 to 2023.3.23 in /docs (<a href="https://redirect.github.com/psf/black/issues/3624">#3624</a>)</li> <li><a href="https://github.com/psf/black/commit/ef6e079901d53a42dfae4ab10b081ce7a73a47b5"><code>ef6e079</code></a> Let string splitters respect <code>East_Asian_Width</code> property (<a href="https://redirect.github.com/psf/black/issues/3445">#3445</a>)</li> <li><a href="https://github.com/psf/black/commit/5c064a986c388e2be1e448c3e4b28e5f5ba7ce5a"><code>5c064a9</code></a> Bump sphinx from 5.3.0 to 6.1.3 in /docs (<a href="https://redirect.github.com/psf/black/issues/3499">#3499</a>)</li> <li><a href="https://github.com/psf/black/commit/3a9d6f0a5f9013b97676f3d24246bd34d93fce4c"><code>3a9d6f0</code></a> Bump myst-parser from 0.18.1 to 1.0.0 in /docs (<a href="https://redirect.github.com/psf/black/issues/3601">#3601</a>)</li> <li><a href="https://github.com/psf/black/commit/53c23e62df9b182edf9e7ccf726acdcf8c25846f"><code>53c23e6</code></a> Support files with type comment syntax errors (<a href="https://redirect.github.com/psf/black/issues/3594">#3594</a>)</li> <li><a href="https://github.com/psf/black/commit/dba3c2695c59fdb11825dbdf8f3b0ab6e0b368b2"><code>dba3c26</code></a> Fix bug introduced in <a href="https://redirect.github.com/psf/black/issues/3564">#3564</a>. (<a href="https://redirect.github.com/psf/black/issues/3615">#3615</a>)</li> <li>Additional commits viewable in <a href="https://github.com/psf/black/compare/23.1.0...23.3.0">compare view</a></li> </ul> </details> <br /> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) Dependabot will merge this PR once CI passes on it, as requested by @RomainMuller. [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
…ackages/jsii-pacmak/lib/targets/python (#4007) Updates the requirements on [wheel](https://github.com/pypa/wheel) to permit the latest version. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/pypa/wheel/blob/main/docs/news.rst">wheel's changelog</a>.</em></p> <blockquote> <h1>Release Notes</h1> <p><strong>0.40.0 (2023-03-14)</strong></p> <ul> <li>Added a <code>wheel tags</code> command to modify tags on an existing wheel (PR by Henry Schreiner)</li> <li>Updated vendored <code>packaging</code> to 23.0</li> <li><code>wheel unpack</code> now preserves the executable attribute of extracted files</li> <li>Fixed spaces in platform names not being converted to underscores (PR by David Tucker)</li> <li>Fixed <code>RECORD</code> files in generated wheels missing the regular file attribute</li> <li>Fixed <code>DeprecationWarning</code> about the use of the deprecated <code>pkg_resources</code> API (PR by Thomas Grainger)</li> <li>Wheel now uses flit-core as a build backend (PR by Henry Schreiner)</li> </ul> <p><strong>0.38.4 (2022-11-09)</strong></p> <ul> <li>Fixed <code>PKG-INFO</code> conversion in <code>bdist_wheel</code> mangling UTF-8 header values in <code>METADATA</code> (PR by Anderson Bravalheri)</li> </ul> <p><strong>0.38.3 (2022-11-08)</strong></p> <ul> <li>Fixed install failure when used with <code>--no-binary</code>, reported on Ubuntu 20.04, by removing <code>setup_requires</code> from <code>setup.cfg</code></li> </ul> <p><strong>0.38.2 (2022-11-05)</strong></p> <ul> <li>Fixed regression introduced in v0.38.1 which broke parsing of wheel file names with multiple platform tags</li> </ul> <p><strong>0.38.1 (2022-11-04)</strong></p> <ul> <li>Removed install dependency on setuptools</li> <li>The future-proof fix in 0.36.0 for converting PyPy's SOABI into a abi tag was faulty. Fixed so that future changes in the SOABI will not change the tag.</li> </ul> <p><strong>0.38.0 (2022-10-21)</strong></p> <ul> <li>Dropped support for Python < 3.7</li> <li>Updated vendored <code>packaging</code> to 21.3</li> <li>Replaced all uses of <code>distutils</code> with <code>setuptools</code></li> <li>The handling of <code>license_files</code> (including glob patterns and default values) is now delegated to <code>setuptools>=57.0.0</code> (<a href="https://redirect.github.com/pypa/wheel/issues/466">#466</a>). The package dependencies were updated to reflect this change.</li> <li>Fixed potential DoS attack via the <code>WHEEL_INFO_RE</code> regular expression</li> <li>Fixed <code>ValueError: ZIP does not support timestamps before 1980</code> when using <code>SOURCE_DATE_EPOCH=0</code> or when on-disk timestamps are earlier than 1980-01-01. Such timestamps are now changed to the minimum value before packaging.</li> </ul> <p><strong>0.37.1 (2021-12-22)</strong></p> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/pypa/wheel/commit/461f7a3a2d4824009ca4855b3300d61e6d405dc4"><code>461f7a3</code></a> Updated version number in <code>__init__.py</code></li> <li><a href="https://github.com/pypa/wheel/commit/e3344b498e69a0228ed1a915233ecc36203ce7e8"><code>e3344b4</code></a> Removed unnecessary rule exemption</li> <li><a href="https://github.com/pypa/wheel/commit/6aaf9c347e3e0893c89bd75aef5905f136a37de2"><code>6aaf9c3</code></a> Created a new release</li> <li><a href="https://github.com/pypa/wheel/commit/566644ac843e1b6ad4089e50ce0c64bf2f4e2417"><code>566644a</code></a> Folded a long line to stay within 88 chars</li> <li><a href="https://github.com/pypa/wheel/commit/e3f9b2b35659599c82e362d8c11f480ff6abb88a"><code>e3f9b2b</code></a> Added missing PR attributions</li> <li><a href="https://github.com/pypa/wheel/commit/9e280dbaab9858a753d9e00e87830d607ecfdb43"><code>9e280db</code></a> Report stderr contents if <code>flit build</code> fails</li> <li><a href="https://github.com/pypa/wheel/commit/4c68d19b5243f0eafa51243bb765ca7f21115fcf"><code>4c68d19</code></a> Added venv* to .gitignore</li> <li><a href="https://github.com/pypa/wheel/commit/a18a70781cc83911c46941d5be0702f4f98eea7c"><code>a18a707</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://redirect.github.com/pypa/wheel/issues/517">#517</a>)</li> <li><a href="https://github.com/pypa/wheel/commit/ba4b195a0ea86bdbe7bccab2dffef987d9d45510"><code>ba4b195</code></a> Added a couple of missing changelog entries (<a href="https://redirect.github.com/pypa/wheel/issues/516">#516</a>)</li> <li><a href="https://github.com/pypa/wheel/commit/934fe177ff912c8e03d5ae951d3805e1fd90ba5e"><code>934fe17</code></a> Changed <code>wheel unpack</code> to honor the original permissions of files (<a href="https://redirect.github.com/pypa/wheel/issues/514">#514</a>)</li> <li>Additional commits viewable in <a href="https://github.com/pypa/wheel/compare/0.38.0...0.40.0">compare view</a></li> </ul> </details> <br /> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) Dependabot will merge this PR once CI passes on it, as requested by @RomainMuller. [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
--- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0
aws-cdk-automation
added
the
pr/no-squash
This PR should be merged instead of squash-merging it
label
Apr 4, 2023
RomainMuller
approved these changes
Apr 4, 2023
Thank you for contributing! ❤️ I will now look into making sure the PR is up-to-date, then proceed to try and merge it! |
Merging (no-squash)... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See CHANGELOG